From bf413928611e004ae3b5a9f73ff9c777cb7e8e70 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Fri, 22 Apr 2011 02:51:52 +0200
Subject: [PATCH] label: Fix an invariant leading to required > minimum

---
 gtk/gtklabel.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 3f83745911..45531d8ae0 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -3568,6 +3568,11 @@ gtk_label_get_preferred_layout_size (GtkLabel *label,
       layout = gtk_label_get_measuring_layout (label, layout, 0, -1);
 
       pango_layout_get_extents (layout, NULL, required);
+
+      /* can happen when Pango decides to ellipsize text */
+      if (required->width > natural->width)
+        required->width = natural->width;
+
       required->x = required->y = 0;
       required->height = natural->height;
     }
-- 
2.30.2